modify conflicts