Test Merging Remote Changes