modify conglict file