don't use full path for log when deleting
Merge remote-tracking branch 'origin/master'