Test commit conflict and resolve