MZ trying to resolve conflicts (2)