Fix merge problems in LM-GENDLT-15