Conflict happensaa !!!
this is the result of merge conflict resolve.
Hello World from Mumbai!
Hello github world from kut-arika-sushi!
My name is Hikaru Sasaki!!! I’m from Japan.
Caption here
Hello!
hello github and git
Hello, Thinking Rex
Hopefully this will create a conflict!
Hello !!! World!!
Hi everyone How are you? this is prayuja.
more conflict – less conflict | conflict 2 | conflict 3 | conflict 4 | conflic 5 |
hello
Caption here
Hello. add message.
hello
konnichiha from shimazaki
Caption here Hello!
Hello GitHub Class Commit from Ono Kondo Arika!
Caption here
hi to all hello everyone