fix extra lines that happened after the merge