debut weapon
fix conflicts