merge fixes and link added for articles