Fixed the merge conflicts with index and gallery