Another merge conflict

src/read_par_json.c

@@ -445,7 +445,7 @@ void read_par_json(FILE *fp, char *fileinp){
             if (HESSIAN && WAVETYPE!=1) {
                 err("No HESSIAN yet for SH");
             }
-        }
+            if(WAVETYPE==3) {
                 if (get_int_from_objectlist("JOINT_INVERSION_PSV_SH_TYPE",number_readobjects,&JOINT_INVERSION_PSV_SH_TYPE,varname_list, value_list)){
                     JOINT_INVERSION_PSV_SH_TYPE=1;
                     fprintf(fp,"Variable JOINT_INVERSION_PSV_SH_TYPE is set to default value %d.\n",JOINT_INVERSION_PSV_SH_TYPE);
@@ -464,6 +464,9 @@ void read_par_json(FILE *fp, char *fileinp){
                 } else {
                     /* Check herer possible dependencies */
                 }
+            }
+        }
+
         if (get_int_from_objectlist("INVMAT1",number_readobjects,&INVMAT1,varname_list, value_list))
             err("Variable INVMAT1 could not be retrieved from the json input file!");
         else