Move merge options into their own scope
New version-aware option
Support version number-based determination of older/newer