fixes fogbugz 10363 added specific class to stop nested conflicts