Fix conflict and LTC issue