fixes a bug introduced in the previous merge conflict resolution