merging shooter and master