merge and tweak