add a post for how version control system generate conflict when merge