Restore region defaults
Add psb region
Resolve conflicts