must commit first
merge conflict