Resolving Room Mix-Ups