post merge-conflict resolve