Fixed class->Instance variables
Fixed Merge Conflict