ministry control section
fix conflict