Sure, I agree and I will be more careful in the future.
Some other annoying conflicts will also appear if the "Fixing Checkstyle" pull request is merged in.
On the other hand we just need the classes MenuDefinitionUnserializer.groovy, UIElementVisualManager.groovy and MenuDefinitionLoader.java of your branch, which shouldn't be a problem to resolve the import/renaming stuff. And two additional changes in the UIWindow class.
Or just add the 3 additional classes in a first step and drop your other changes, which isn't that much. This could than be implemented again in a second step. We don't need it fully functional yet.
Some other annoying conflicts will also appear if the "Fixing Checkstyle" pull request is merged in.
On the other hand we just need the classes MenuDefinitionUnserializer.groovy, UIElementVisualManager.groovy and MenuDefinitionLoader.java of your branch, which shouldn't be a problem to resolve the import/renaming stuff. And two additional changes in the UIWindow class.
Or just add the 3 additional classes in a first step and drop your other changes, which isn't that much. This could than be implemented again in a second step. We don't need it fully functional yet.