Fixed a wrong fixed conflict