Setting up Local / Cloud Merge