merge created garbage comment. revert to before merge
Merge remote-tracking branch 'origin/master'