fixed battles and colonization
added fleet merge