b_commit
-A
-A
Merge branch 'new_branch'

Conflicts:

WildGuess.xcodeproj/project.xcworkspace/xcuserdata/austinkuo.xcuserdatad
/UserInterfaceState.xcuserstate