deleting temporarily
resolving a conflict