Merging local copy with remote copy and testing to make sure everything
works (Tried this on my surface and broke everything)