Rebase stuff

Wahlah no more whitespace issues