added in a no conflict solution and tested