canonicalized branch names (in branch_list) so that they are now in the same format as branch_name
Merge remote-tracking branch 'remotes/origin/master'