fixed typo
merge <upstream/master>