Allow admin to copy survey to another organization
Fix merging conflicts