conflicts resolved?
fix multidef
temp commit (by cron)