Committing changes before branching
wah merge conflicts