Missed some lines in manual merge