fixed a bad merge that dropped a line