second conflict
Merge pull request #2 from Doralyp/small-conflict

second conflict