fixed some merge conflicts I added through rebasing
fixed some merge conflicts I added through rebasing

hacken-in/hacken-in,hacken-in/hacken-in,hacken-in/hacken-in,hacken-in/hacken-in,hacken-in/website,hacken-in/website,hacken-in/website,hacken-in/website