Whoops sloppy conflict fixing