Battle Widget
merge conflictsj