adding no conflict mode