I suppose a merge commit.