Update version pins
Resolve merge conflict
Update theme resources and rebuild