validations put in
conflict resolved