Add mergeUp

And rename mergeWith to mergeDown