try fixing master
fixing conflict in index