All conflicts resolved