validation stuff
fixed merge conflict
stuff