Resolve conflicts using fixes made on UpdateHoTUnformat