Fixed Merge Fix

Added Closing Class Curly Brace
Auto-gen
Auto-gen