fix merge_accel to return conservative acceleration

[mdbernard]

This function has a logical error in which it returns non-conservative, rather than conservative acceleration. This results in incorrect position/velocity propagation, since the gravity exists.