add shot
merge