conflict prevention

conflict prevention