Commit conflict file from gitdemo3