Merge errors, UI

Are you sure these equations are right? It looks like the same problems
(objects don’t fall) are still in effect, although that might be due to
a decrease in dt.