Rebase stuff

Viola no more whitespace issues