Verifying merge conflict