update another_file
Merge remote branch 'origin/master' into temp