Fixes a merge conflict whoopsie.