solve conflict in index