first commit on pg one
fixed conflicts