Initial work to add merge support

* Add and update files to hold merge code