Updating index to show conflicts