Update the article related to git collision