removed conflict wrong resolution