Wrote a custom view controller
Solving a merge issue with custom-view-controller