lines from another commit snuck in