added base view controller - dump your views here
merge conflict