Fixing merge

web/react/components/admin_console/admin_sidebar.jsx

@@ -180,7 +180,7 @@ export default class AdminSidebar extends React.Component {
                                         className={this.isSelected('image_settings')}
                                         onClick={this.handleClick.bind(this, 'image_settings', null)}
                                     >
-                                        {'Image Settings'}
+                                        {'File Settings'}
                                     </a>
                                 </li>
                                 <li>