check-merge-conflict