test
resolve conflicts
fixed the NaNs