removed unnecessary files in mergeCode
added battle, battlelog, and status files