Trying to resolve conflicts...