post merge conflict commit