Will this resolve the conflict?