Deleted the old conflicting file