Improved the merging between the two codes: now it compiles.