Extended the MergeVisitor to collect the errors encountered while merging
Extended the classes used for storing the result from the code generation of a module (e.g. class) to also store potential errors experience while merging that module
Made the core part of the Java code generation take merging errors into account
Made the IDE part of Java code generation report merging errors to the user