Merging the merge

[permalink]