noun, masculine/kɔ̃.fli d(ə) mɔ.di.fi.ka.sjɔ̃/plural: conflits de modificationconflit de modification is masculine in French.edit conflict