Merge branch 'feature/conflict-yoshihito' into 'main'

conflictを意図しています2 by yoshihito

See merge request !9

hello.c

 #include <stdio.h>
 
 int main(void) {
-    printf("hello, conflict!\n");
+    printf("hello, conflict2!\n");
 }
\ No newline at end of file