Merged and fixed merge.