Need help merging code

This Simple Merge Demo may help.

Before trying to merge the programs go through the two of them carefully to make sure they are not both trying to use the same resource - for examples an I/O pin. If you find conflicts change something in one of the separate programs and make sure it still works with the change.

...R