Fix the conflicts with qx