fix conflict param