Finished and tested merge.