Revert "A merge test."

This reverts commit 3b70cb7e025a5ced33318dfd91ddef2892f9d16d.