fonflatter/scaffold: Use updated merge script