pull
fix conf