@merge confilt