repare conflict