fix of autoresolved conflict
Merge branch 'master' of https://github.com/mff-uk/intlib