view controller
merge w view
resolved actual conflicts