conflict
merge conflict
fixing shotmanager, still doesn't work properly