Resolve merge conflicts

* associated with the problem views from integrating with the javascript workflow