Final conflicts solved