laposhko commit in gitHub1
laposhko commit in gitHub2
laposhko commit in gitHub3
gitHub conflict is OK