Fixed issue with Set & Certify overwriting existing conflict states
Fixed issue with Set & Certify overwriting automatically conflicted and anything users have set manually
Fixed issue with Set & Certify overwriting automatically conflicted and anything users have set manually