Commit
Conflicts resolves