Remove dirty merge consequences