Merge with harry from remote pull