Started on survey view
Merged