kelly updates conflict boom
kelly change attempt 2
kellys update
for really reals