fix for readme merge conflict