merge conflict fixed in index