comflicy change