trying to resolve conflicts N2