No ticket - Fix conflict