Merging conflicted index file