add validation
add projects#edit
conflict merge