fix position appear of nitro and gun
merge
fix conflic