fix not merge