You can use LocalSync and WPMerge combined.
Kindly make sure that
1) On the LocalSync settings page:
- Exclude all the DB tables and sync only the files, do not sync Database if you plan to use WPMerge.
2) On the WPMerge plugin settings page:
- Exclude all the LocalSync related DB tables (with the prefix *_local_sync) so that it will not overwrite LocalSync plugin settings.