git rm --cached
Merge branch 'master' of Github.com:wall2flower/untitled