Unification of the Deformed and Resolved Conifolds