+ [2016-12-16T09:47:00Z] corpsicle does github do any deeper conflict resolving than git in itself does?