validate forms and add image to client
fix pull conflicts