Changed the readme in a conflicting, mean way.
Moved lines around to hopefully resolve the conflict.