Section 5.0: conflicts

check out the branch authors look through its history.
go back to master
try to merge authors into master. What happens?
check the status with git status
open and edit the file that has conflicts. Make sure that all unique authors are included from each commit, but no names are duplicated. Save your resolved conflicts.
check the status again with git status
add and commit your changes