remove text - just assumer text or component
fix conflict