-fixing conflict in index.