more flexible merge arguments
more flexible merge arguments

cgyarvin/arvo,solri/arvo,belisarius222/arvo,ohAitch/arvo,ohAitch/arvo,ngzax/urbit,urbit/urbit,ngzax/urbit,jfranklin9000/urbit,belisarius222/arvo,ngzax/urbit,jfranklin9000/urbit,urbit/urbit,urbit/urbit,Fang-/arvo,cgyarvin/arvo,urbit/urbit,urbit/urbit,ngzax/urbit,jfranklin9000/urbit,urbit/urbit,ngzax/urbit,jfranklin9000/urbit,joemfb/arvo,ngzax/urbit,jfranklin9000/urbit,eglaysher/arvo,jfranklin9000/urbit,urbit/urbit,joemfb/arvo,jfranklin9000/urbit,ngzax/urbit