merge protou + protodug