Fix flaky git commit issue