add two Guardfiles for two different approaches to merging

The documentation is current in the comments for each -
still need to add something to the devguide.