remove a bit i missed in the merge conflict