a simple example to show how to rebase and generate a conflict
I'm adding a simple commit here to demonstrate a PR.
Adding another line to demonstrate "out-of-date"
This line is a super-cool new feature.
This is the next mind-blowing feature.
Can't stop the feature train.
Squashing bugs and taking names.