Adds show view
Resolves conflicts