commiting after a merge cleared an earlier commit