weird merge problems
That's better. That's the version i want.