fix for configure-form
fix conflict