openEBL upload problem

[JoshiRaghavendra]

Hi all,

I am trying to upload our gds file to the submissions github page (https://github.com/SiEPIC/openEBL-2024-05). But I'm getting the following error message, "This branch has conflicts that must be resolved", despite clearing all checks in KLayout.

attaching our gds file below,
EBeam_commlab_student.zip

I'm using waveguide heaters as thermo-optic phase shifters for designing a programmable bandstop filter.
Are there any instructions or constraints for the metal pads of the heater?

Regards,
Raghavendra