committing changes that are unresolved
fixing merge error
merge conflicts