destroying delete bugs
merging conflict