After merging, I synced to live site

There are a few differences in the code.
Testing is required.