added battleActivity backgrounds and stuff
merged battle and pass conflicts