fixed dumb merge bug