someone forgot to resolve conflicts