Adjusted merge of ent