commit conflict file from gitdemo3