Market GUI Updates
Merge Conflict Resolution