updating with manage tips view controller
forgot to addfile
fixed conflicts