commit before branching
resolved conflict