upgrade fork/union logic to disallow field duplication before flush