Update ViewController.m

conflict test