Resolve a merge derp.