fix conflics in reg