Conflicts resolved (again)