resolve conflicts mmascher wildcards