Map reset. Commit for Bacon.
Everything merged correctly by Bacon =D