Fix bug in builder-merge