Small bug with duped folders, they should now be combined correctly