Changed some stuff so the Battle Controller works
Fixed merge conflict