updated the log
Merge remote-tracking branch 'origin/master'
updated log again