resolved clearance conflicts