Delete redundant parameter in mapMerge
Fix nullability issue with Class.getSuperclass()