comflict changes