Fixed error die to merge and delayed commit (fast-fareward)