remove conflict localizable strings file
Merge branches 'master' and 'master' of https://github.com/Magnat12/MGServerExchange