commit conflict test