Removing conflict in index files