Fix no conflict mode