Final correct merge.