merging hltadapter and fixing l1adapter