Fixed branch

Is this how you want it to look?

Don't worry about the last commit, that's how it's meant to be.