added a link in a comment
resolved a conflict