Fixed botched merge conflict