Added comments. Lets see if merge worked...
work?
mnmnmn
are we there yet
are we there yet?
are we there?
Merge remote-tracking branch 'origin/master'
yes