client forms implemented
fixed conflicts