Fix merge error
Fix render lifetime for renderItem children