Fixes a botched merge