Bugfix with merge, class is now imported