fixed merge silliness and line parsing bug