c2 line 3added
c2 line3 added
Merge branch 'feature3', conflict c2 solved
Merge branch 'master' of https://github.com/OndrejRitomsky/test