weapons and animations added to characters
conflict Fixes