resolved merge conflicts

pom.xml

...g/monticar/cnnarch/gluongenerator/AllAttentionModels.java

...e/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java

...uongenerator/CNNArch2GluonArchitectureSupportChecker.java

...arch/gluongenerator/CNNArch2GluonLayerSupportChecker.java

...narch/gluongenerator/CNNArch2GluonTemplateController.java

...nticar/cnnarch/gluongenerator/GluonConfigurationData.java

src/main/resources/templates/gluon/BeamSearch.ftl

src/main/resources/templates/gluon/CNNCreator.ftl

src/main/resources/templates/gluon/CNNDataLoader.ftl

src/main/resources/templates/gluon/CNNNet.ftl

src/main/resources/templates/gluon/CNNPredictor.ftl

src/main/resources/templates/gluon/CNNSupervisedTrainer.ftl

src/main/resources/templates/gluon/CNNTrainer.ftl

src/main/resources/templates/gluon/elements/ArgMax.ftl

src/main/resources/templates/gluon/elements/BeamSearch.ftl

src/main/resources/templates/gluon/elements/BroadcastAdd.ftl

.../resources/templates/gluon/elements/BroadcastMultiply.ftl

src/main/resources/templates/gluon/elements/Concatenate.ftl

src/main/resources/templates/gluon/elements/Const.ftl