removed lines that merge didn't remove