updated level up message/battle selection
updated local branch after pull
fix conflicts after merge