mergeConflictFix

main.c

@@ -8,10 +8,15 @@ int main(void)
     {
         case 1: 
             printf("x = 1 \n");
+            break;
         case 2: 
             printf("x = 2 \n");
+            break;
         case 3: 
             printf("x = 3 \n");
+        case 4:
+            printf("x = 4 \n");
+            break;
         default:
             printf("x is not in case");
     }