Working map, commit before trying merge parser