Should resolve the conflict