updating sync and surf pages
Fixing Merge Conflicts