Map re-commit due to merge conflict