removed nans
merged