fix text
fix conflicts