update the NSLog in ViewController
merge