Fixed everything

Changes:
- Merge shooting with gems created