commit after merge with git origin/master version