- trying to resolve conflicts