changes to schema and added ivy image
fixing merge conflict