forgot to remove nextViewController
merge conflict red