fix race condition on MergeAction