replacing lines from another botched merge