Committing conflicted changes
Resolved