Changed order.
Merge remote-tracking branch 'origin/master'
Checking to see if server finishes this faster.