Fixing mailing link
Fixed merge conflict