weapon button added
merge