reset master to track upstream master as exact copy
fix sidebar for content edit view - use namespace prefix with routing helper