final-ish merge