Setting the provisional map
Conflicts resolved