yes, it's just that the Doctor now knows he's romantically involved with the daughter of a companion, which is obviously going to be a bit weird, but it won't matter, coz Amy and Rory and Melody will live happily ever after after this series, I'd imagine, and new companions will take over, so it won't be weird for long.