fix builder-merge