Add mergeUpWith

And rename mergeWith to mergeDownWith