fixed a merge error leftover