i thought it was both. they identify with the oposite sex parent and then (since they realise that the parents have a special relationship that the kid can't be a part of) they identify with the same sex parent. the identification with the same sex parent is meant to be the resolution, i thought.