Cleanup unmerged changes in index and config