Shooter update (house)
Shooter - Conflict fix