Resolving Rifts