[test_data] resolved merge conflict, MEREGED with new_layout branch
[test_data] resolved merge conflict, MEREGED with new_layout branch


Former-commit-id: 694b6d8bd99c7cd316c535c171d1ce2ef85e7e95
pygeo/pycmbs,pygeo/pycmbs