adds singular view
merge conflicts