fixed minor merging bug. hum.