I have permissions fixed and battlegen is coajefoijqew f
Merge remote-tracking branch 'origin/master'