Merge changes in local and remote repository