diff --git a/index.html b/index.html index 7dce693..8f745e1 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@

Demo Merge Conflicts

Greg and Amil asdlfsdddfsd

-

Amil Amil Amil

+

Amil Amil GREG

askfjsdfklsajklfdjfklsdjfsdlkjsdfklsdjklsjadklfjklasdjfklasdfjsdklfjdklafjdklfsadjfklsdjksldj Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod