fixed typo
merge / conflict