Actually resolve the conflict; I swear I do this for a living