forgot a merge conflict
fix