keep history after reset to ub-now-lunchbox-release@1069658 am: 2b8dbe3a5f am: 319e21ec62 am: ce566c0e93 am: 1c30b578e1 am: 9fa7ca7d65
am: dcc908e147  -s ours

* commit 'dcc908e147853cf5e0552bcf387c22616f89fe16':