added a view controller
merge