controller class
merg conf fix