WIP: using ruby-style merge