replaced conf
fix
merged