modified sync scripts to track client and server hashes for conflict resolution