commit conflict code from gitdemo3