Removing views
merge conflict.