gw2d: .gitignored persistent/archives, ensured folder is created
gw2d: Resolved merge conflicts