Database

merge conflict: finally merged database branch with battleactivity.java