Created a new index
Resolve Conflicts