ups the conflict didn't auto fix..