fix and test child and parent comments
fix accidental conflict