fix abilities not working

merge error