remove stray line from previous merge