Module conflict Fix (Point and Admin share)