gun half working
hopefully fixed merge conflicts