add the ability to port modifications forward to the current patch
include all available patch types in the metadata
add basic patch test builders
wip
add basic conflicts test