diff --git a/package-lock.json b/package-lock.json
index d051a73..91ddb35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,12 @@
 {
     "name": "@helsingborg-stad/hbg-react",
-<<<<<<< HEAD
-    "version": "1.0.16",
-=======
-    "version": "1.0.15",
->>>>>>> 02b55006dd22466a3f41737bb875418f0480a961
+    "version": "1.0.18",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@helsingborg-stad/hbg-react",
-<<<<<<< HEAD
-            "version": "1.0.16",
-=======
-            "version": "1.0.15",
->>>>>>> 02b55006dd22466a3f41737bb875418f0480a961
+            "version": "1.0.18",
             "license": "MIT",
             "dependencies": {
                 "classnames": "^2.3.1",
diff --git a/src/components/Form/Input.js b/src/components/Form/Input.js
index 77a2ae1..3cb1cee 100644
--- a/src/components/Form/Input.js
+++ b/src/components/Form/Input.js
@@ -101,7 +101,7 @@ class Input extends Component {
 
         return (
             <div>
-                <div className={`c-field c-field--text c-field--md c-field--radius-md ${[...(props?.classNames ?? [])].join(' ')} ${(props.icon || props.icon_suffix) ? 'c-field--icon' : ''}`}>
+                <div className={`c-field c-field--text c-field--md c-field--radius-md ${[...(props.classNames || [])].join(' ')} ${(props.icon || props.icon_suffix) ? 'c-field--icon' : ''}`}>
                     {props.label && (
                         <label htmlFor={props.id || props.name} className="c-field__label">
                             {props.label}{' '}
diff --git a/src/components/Pagination/Pagination.js b/src/components/Pagination/Pagination.js
index e0dfd25..58f12cf 100644
--- a/src/components/Pagination/Pagination.js
+++ b/src/components/Pagination/Pagination.js
@@ -67,7 +67,7 @@ class Pagination extends Component {
                             className="c-pagination__link"
                             size="small"
                         >
-                            <span className="u-sr__only">{langPrev ?? "Previous page"}</span>
+                            <span className="u-sr__only">{langPrev || "Previous page"}</span>
                             <i className="c-icon c-icon--size-sm material-icons" translate="no" aria-hidden="true">
                                 chevron_left
                             </i>
@@ -106,7 +106,7 @@ class Pagination extends Component {
                                         className="c-pagination__link"
                                         size="small"
                                     >
-                                        <span className="u-sr__only">{langGoToPage ?? "Go to page: "} </span>{page}
+                                        <span className="u-sr__only">{langGoToPage || "Go to page: "} </span>{page}
                                     </Button>
                                 </li>
                             ))}
@@ -142,7 +142,7 @@ class Pagination extends Component {
                             className="c-pagination__link"
                             size="small"
                         >
-                            <span className="u-sr__only">{langNext ?? "Next page"}</span>
+                            <span className="u-sr__only">{langNext || "Next page"}</span>
                             <i className="c-icon c-icon--size-sm material-icons" translate="no" aria-hidden="true">
                                 chevron_right
                             </i>