Doc conflict

should fix it.