restore lines missed in merge