Adding cmd/conflict section