changed conflict line
Merge pull request #12 from vlatkokaplan/branch1

changed conflict line