added punctuations back
fixed conflicts