fix conflict settings