commit file conflict from gitdemo3