partly done conflict class