My local changes would be lost so I am committing instead of stashing.
Merge remote-tracking branch 'origin/master'