fixed another patch conflict