Semi-fixed merging

It's still broken, just not quite as badly.
Merge branch 'master' of https://github.com/Psiryu/4000War