fixed typo on landing
merge master, resolved conflict