recording update to log
fix merge conflict
Automated new jobs collected on 2014-04-11