rm conflicts