Commit before merge
Resolves merge conflicts