fixed another merge issue