Fix for smoother lines
Including conflicted ScratchOffAgent

No longer have time to mess around with git. I'm just gonna work in
master :)