Merging the merge

[permalink] [random]