Real merge conflict

Let's use the new code rather than the old code!