Fix botched merge
1 file changed