XO.Controller and XO.View enhanced
merge from remote