adding chosen form and merge fix
fixing merge issue