either don't do a bold histmerge or undo it when it's proven to be contentious if you're gonna be away for days lfdder