Merge pull request #5 from lukin0110/feature/new-po

Feature/new po
another test
another test on the branch
better conflict handling