Minor UI update
Removing my own changes to sort merge conflict