Fixed some errors in merging, with running llr optimizer analysis.