fixed link bug
fixed conflicts