fixes #7674 preserve prefix during merge