keep history after reconcile of gingerbread-release