Resolved conflicts + added i18n links for share link