form stuff
fixed conflicts