file2.txt

/* Here is a comment not worth making . . . Smashing Pumpkins Rules! */

This is What is foolishness?! However will we continue? This is a conflict!
Blah blah blah

Secret code change - everyone knows the secret.

One more time changing

I am changing this
Changing another something


Veggies es bonus vobis, proinde vos postulo essum magis kohlrabi welsh onion daikon amaranth tatsoi tomatillo melon azuki bean garlic.

Gumbo beet greens corn soko endive gumbo gourd. Parsley shallot courgette tatsoi pea sprouts fava bean collard greens dandelion okra wakame tomato. Dandelion cucumber earthnut pea peanut soko zucchini.

This is Micah's change to this file; I hope everyone enjoys it.

Dave is not here man!

Conflict resolution is cheaper than lawyers.

Hello, my name is Inigo Montoya, you killed my father, prepare to die!!

Sara and Rafael will make their edits to the top of the file.  The top of the
file is good.  No points for this change.

Here is an old file. It is sort of good.

I love kittens and cute puppies! (not all puppies are cute)

Rebase test #2. Both Adrian and Steve made changes to this line.

Here's a change from the first user. -- Linda's Change. Steve, why are you messing with my code?

Here's yet another change from a super-mysterious mustached masked man.

h1 {font-size: 2em;}

Welcome Linda, Rick, or Steve!

Makin a change!

Making another change just for the fun of it.

We will win.

You must not know 'bout me
You must not know 'bout me
I can have another you by tomorrow
So don't you ever for a second get
To thinking you're irreplaceable

This is my change.

Yet another change, maybe the best one?  :)  Nooo... maybe not.  :(

Boomchakalaka BOOM!

WOOT WOOT!