fix --no-ff merge
fix --no-ff merge

zhengger/explain-git-with-d3,git-school/visualizing-git,eshimel/explain-git-with-d3,zahrashokrollahi/explain-git-with-d3,git-school/visualizing-git,majidmosafer/jahad,onlywei/explain-git-with-d3,majidmosafer/jahad,eshimel/explain-git-with-d3,zhengger/explain-git-with-d3,zahrashokrollahi/explain-git-with-d3,onlywei/explain-git-with-d3