Undo continuous2 and master merge.