Fixing Merge Issues
The UI and the camera system broken in the last bout of merges, so I got them working again.