changed the form for pvt key
fixed conflicts