report fixes
control panel
merge