resolve branching conflict

It is my first time testing out git branching, so sure I would make
mistakes. Now I know the basics.