Merge Cost_Map into Master