Fix parent pass-through after incorrect merge