Cleaning up merge

I may not have BeyondCompare configured correctly.  I had to manually
clean up the differences