first commit
Merge form that does nothing
Almost working
All tests passing
Changed name of form to merge_with