Resolving cyng conflict