New map
Resolved conflicts
Resolved conflicts