merged local changes with remote server