why the hell is the stupid map file the only thing not committed
merges .map silliness