Conflict resolution
Multiple fixes + You can now click on the + button and the - button to remove or add maps