FL-1603: Modify how the merge script handles the sera overlay