Feature/1.1.2/battle