Kelsey question functionality merge