branching
branch2
resolve merge conflict
added notes