Fixed index after mege conflict