changes to test merging to remote server