[master] Send data between segues
[master] Fix conflicts