first today, use () even you are sure
second today
Merge remote-tracking branch 'origin/master'