clarify resource conflict status, rebase to master remove ResourceConflict, replace usage with Conflict