Forgot to fix block area positions after the merge before branching. Fixed the second file to be well-formed.