Revert "Remove extra files from merge."

This reverts commit a5b7baf9a829ebca10e78569a5459963059247c0.