Commit changes
Resolve merge conflict