now keeping the line used for the link
fixed conflicts