Deleting tmp file
tmp add
Merge remote-tracking branch 'origin/master'