recover from crap merge