survey creation
fix merge conflicts