merged database with battleactivity.java