rpza: resolve conflicts