reverted conflicting case