Fix merge issues

web/react/components/posts_view_container.jsx

@@ -2,15 +2,18 @@
 // See License.txt for license information.
 
 const PostsView = require('./posts_view.jsx');
+const LoadingScreen = require('./loading_screen.jsx');
+
 const ChannelStore = require('../stores/channel_store.jsx');
 const PostStore = require('../stores/post_store.jsx');
-const Constants = require('../utils/constants.jsx');
-const ActionTypes = Constants.ActionTypes;
+
 const Utils = require('../utils/utils.jsx');
 const Client = require('../utils/client.jsx');
 const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
-const LoadingScreen = require('./loading_screen.jsx');
+
+const Constants = require('../utils/constants.jsx');
+const ActionTypes = Constants.ActionTypes;
 
 import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx';