Fixing CreatePlaces again

Still getting rid of the <<<<HEAD things