Remote getRemote as it's not used anywhere.
Fix conflicts and merge.