try to fix merge again
Merge branch 'master' of https://github.com/seub/Hitchin