contentpanel
fixed merged