A G2 Unification of the Deformed and Resolved Conifolds