fixed typo
fixed conflictt