typo
conflict resolved