just a couple fixes
updated segue
merge conflict fixed