change contents to type text and remove name from components
fixed merge