fixed typo and conflict message