update after merged