merge + cleanup