Small bugfix
Conflict resolution and scen with minimap