added pipe
fixed conflicts