Change from git to https, merging with master