fix another merge conflict