Uploading Index Changes
Fixing merge issues