Fixed the explosion.

Please delete your local files and re-clone to avoid another merging
issue.