Final conflicts resolved