convert merge conflict to base
rename merge to check