attempt to fix another merge error