Articleft url added
fixed conflicts