Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages)