Add sth to git-sample
Resolved conflict