Forgotten timestamp update after merge