UG tweaks
Conflict resolves