added a changed within the branch.
made change in branch
made other guy comment in the master branch
fixed merged conflict.