Fixed conflict (CVS)