Fixing the github mess

- First discard all changes you have done to this file
- accept pull request
- do what you normally do
- commit and synchronise!