commit to up files 1st
Merge remote-tracking branch 'origin/master'