solved conflict add/validate