not sure what this is
Merge remote-tracking branch 'origin/master'
Committing to pull
Merge remote-tracking branch 'origin/master'
nothing
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'