Simulating gravity
Fix merge conflict in mainwindow.h