Fixing gallery display and adding conflict resolution js files