re-add 2 accidentally deleted lines in the merge