validations merge fix