changed kr to the way nonconflict will be in the future