partial commit
merge conflicts