commit before merge
merging after conflict