link following
fixed conflicts