merge some stuff