first version nbody
merge fixed