fixed validation errors
fixing merge conficts