resurrect old developing
CONFLICT (modify/delete)