preparing to resync spatial changes into master